Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove ghc-api source snapshot #2156

Merged
merged 10 commits into from
Sep 7, 2021
Merged

Remove ghc-api source snapshot #2156

merged 10 commits into from
Sep 7, 2021

Conversation

pepeiborra
Copy link
Collaborator

@pepeiborra pepeiborra commented Sep 4, 2021 •
edited
Loading

We can replace the source snapshot with Cabal conditions to unblock Hackage uploads until #2128 lands

The source snapshot cannot be removed for ghc 8.10.7 nor 9.0.1. In the former, an allow-newer suffices, but in the later we need unreleased changes that can only be obtained via the source snapshot.

/cc @fendor

@pepeiborra pepeiborra force-pushed the ghc-api-compat branch 2 times, most recently from 3041719 to 7a2730e Compare September 4, 2021 09:49
@jneira
Copy link
Member

jneira commented Sep 4, 2021

this looks like can be backported to 1.3.0-hackage
I was thinking in give up trying to release 1.3.0 and go directly for 1.4.0 starting right now, thoughts?

@pepeiborra
Copy link
Collaborator Author

this looks like can be backported to 1.3.0-hackage
I was thinking in give up trying to release 1.3.0 and go directly for 1.4.0 starting right now, thoughts?

When do you plan to release 1.4.0? We haven't had a Hackage release in a long time, and this has been blocking adoption for several user groups.

@jneira
Copy link
Member

jneira commented Sep 4, 2021

I wanted to start it asap, to have 8.10.7 support amongs other things

@jneira
Copy link
Member

jneira commented Sep 4, 2021

btw ghc-api-compat does not have support for ghc-8.10.7 without allow newer 😕

@pepeiborra pepeiborra marked this pull request as ready for review September 5, 2021 06:34
@pepeiborra pepeiborra force-pushed the ghc-api-compat branch 4 times, most recently from cbeb702 to 0151d24 Compare September 5, 2021 14:20
@pepeiborra
Copy link
Collaborator Author

This is ready to go! GHC up to 8.10.6 is the best I could do until Sylvain uploads new versions to Hackage or until @fendor lands #2128

jneira
jneira approved these changes Sep 5, 2021
View reviewed changes
Copy link
Member

@jneira jneira left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

many thanks for the plumbing work, maybe the conditionals will be removed soon (if fendor's pr lands soon)

@pepeiborra pepeiborra added the merge me Label to trigger pull request merge label Sep 5, 2021
@jneira jneira mentioned this pull request Sep 6, 2021
Merged
@pepeiborra
Copy link
Collaborator Author

Sylvain has uploaded new versions to Hackage, so I will add more conditionals and resubmit

@jneira
Copy link
Member

jneira commented Sep 6, 2021 •
edited
Loading

@pepeiborra it seems we could merge soon #2156 so we could:

  • close this and go for it directly, i think it could be hard to backport, so we would go for 1.4.0 and skip 1.3.0 for hackage
  • merge this, backport to 1.3.0 and make the hackage release, and rebase and merge Remove ghc-api source snapshot #2156 just after that
  • backport this pr to 1.3.0-hackage without merge it in master

thoughts?

//cc @fendor

@pepeiborra
Copy link
Collaborator Author

Merge, backport and upload to Hackage is my preference, assuming it's not holding #2128 back

@jneira jneira mentioned this pull request Sep 7, 2021
Merged
4 tasks
@mergify mergify bot merged commit a23b66c into master Sep 7, 2021
@jneira
Copy link
Member

jneira commented Sep 7, 2021

@Mergifyio backport 1.3.0-hackage

@mergify
Copy link
Contributor

mergify bot commented Sep 7, 2021

Command backport 1.3.0-hackage: failure

No backport have been created

  • Backport to branch 1.3.0-hackage failed: Git reported the following error:
Auto-merging stack-9.0.1.yaml
CONFLICT (content): Merge conflict in stack-9.0.1.yaml
Auto-merging stack-8.8.4.yaml
Auto-merging stack-8.8.3.yaml
Auto-merging stack-8.6.5.yaml
Auto-merging stack-8.6.4.yaml
CONFLICT (modify/delete): stack-8.10.7.yaml deleted in HEAD and modified in a23b66c3 (Remove ghc-api source snapshot (#2156)). Version a23b66c3 (Remove ghc-api source snapshot (#2156)) of stack-8.10.7.yaml left in tree.
Auto-merging stack-8.10.5.yaml
Auto-merging stack-8.10.4.yaml
Auto-merging stack-8.10.3.yaml
Auto-merging stack-8.10.2.yaml
Auto-merging plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal
Auto-merging plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal
Auto-merging hls-plugin-api/hls-plugin-api.cabal
Auto-merging haskell-language-server.cabal
Auto-merging ghcide/ghcide.cabal
Auto-merging cabal.project
Auto-merging cabal-ghc901.project
CONFLICT (content): Merge conflict in cabal-ghc901.project
error: could not apply a23b66c3... Remove ghc-api source snapshot (#2156)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

pepeiborra added a commit that referenced this pull request Sep 7, 2021
@pepeiborra
Remove ghc-api source snapshot (#2156)
0ccd6d7 
* Remove ghc-api source snapshot

We can replace the source snapshot with Cabal conditions.
This will unblock Hackage uploads until
#2128 lands

* fix 9.0.1 build

* add allow-newer for ghc-api-compat

* fix version bounds for 9.0.1

* fix hls-eval-plugin

* stack fixes

* added new versions of ghc-api-compat

* remove source snapshot from ghc901 cabal project
@pepeiborra
Copy link
Collaborator Author

Backported manually

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jneira jneira jneira approved these changes

Assignees
No one assigned
Labels
merge me Label to trigger pull request merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pepeiborra @jneira